From a6869d9d5ce414c042ddeae0fc60e058aaca90a2 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Tue, 13 Sep 2005 10:40:29 +0000
Subject: [PATCH] synch_bitops.h is an arch-specific header file.

Signed-off-by: Keir Fraser <keir@xensource.com>
---
 linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c                   | 2 +-
 linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c                   | 2 +-
 linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h          | 2 +-
 .../include/asm-xen/{ => asm-x86_64}/synch_bitops.h             | 0
 linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h        | 2 +-
 linux-2.6-xen-sparse/include/asm-xen/evtchn.h                   | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename linux-2.6-xen-sparse/include/asm-xen/{ => asm-x86_64}/synch_bitops.h (100%)

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
index 6cb42af88a..5926bcf99e 100644
--- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
@@ -37,7 +37,7 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/ptrace.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/xen-public/event_channel.h>
 #include <asm-xen/xen-public/physdev.h>
 #include <asm-xen/hypervisor.h>
diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
index 63080358d8..9d2db353a4 100644
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
@@ -19,7 +19,7 @@
 #include <asm-xen/xen_proc.h>
 #include <asm-xen/linux-public/privcmd.h>
 #include <asm-xen/gnttab.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 
 #if 1
 #define ASSERT(_p) \
diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
index 3aa047dc9d..6c991e8058 100644
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
@@ -4,7 +4,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm/segment.h>
 #include <asm/cpufeature.h>
 #include <asm-xen/hypervisor.h>
diff --git a/linux-2.6-xen-sparse/include/asm-xen/synch_bitops.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h
similarity index 100%
rename from linux-2.6-xen-sparse/include/asm-xen/synch_bitops.h
rename to linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h
diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
index c38dcb829f..518dcdf5a3 100644
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
@@ -4,7 +4,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <asm/segment.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/arch-x86_64.h>
 
diff --git a/linux-2.6-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
index e38e6822c8..ff522a927e 100644
--- a/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
@@ -35,7 +35,7 @@
 #include <linux/interrupt.h>
 #include <asm-xen/hypervisor.h>
 #include <asm/ptrace.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/xen-public/event_channel.h>
 #include <linux/smp.h>
 
-- 
2.30.2